projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e27da1b 74f81dd)
bitkeeper revision 1.1236.1.116 (424131f7rCir_eG6bLO6UbIol4mpgA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 23 Mar 2005 09:08:07 +0000 (09:08 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 23 Mar 2005 09:08:07 +0000 (09:08 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
tools/libxc/xc_private.h patch | diff1 | diff2 | blob | history
xen/common/domain.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc_private.h
Simple merge
diff --cc xen/common/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.